searchDisplay: Remove doSearch

This is nothing but a middle man, as the view selector already owns
the search system. We want to start being a bit more tricky with what
we do with the search system so that we ignore whitespace, so let's
cut the middle-man out now.

https://bugzilla.gnome.org/show_bug.cgi?id=693458

diff --git a/js/ui/searchDisplay.js b/js/ui/searchDisplay.js
index 9ae993efc8f02d6c9a6864dad77ef391a9e99e9d..9c6c063143e4391a1dd1ae47b88fd459a93f848a 100644 (file)
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@@ -432,10 +432,6 @@ const SearchResults = new Lang.Class({
         this._statusBin.show();
     },
 
-    doSearch: function (searchString) {
-        this._searchSystem.updateSearch(searchString);
-    },
-
     _metaForProvider: function(provider) {
         return this._providerMeta[this._providers.indexOf(provider)];
     },

diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index a87c54c5343ed7cc3923d52b857112b422d52109..f2da6d1837194c78a99764190cc6c61802e6066b 100644 (file)
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -423,7 +423,7 @@ const ViewSelector = new Lang.Class({
 
     _doSearch: function () {
         this._searchTimeoutId = 0;
-        this._searchResults.doSearch(this._text.text);
+        this._searchSystem.updateSearch(this._text.text);
 
         this._showPage(this._searchPage);
     },